Remove more trailing spaces