City cleans up with new three-year trash contract