Remove spaces. Nasty things.

Change-Id: I0f382f7200681d9efdcfd5cedc359697b67ba1ec