Remove extra spaces (batch #2)