Remove trailing spaces

Remove trailing spaces added in #5296