Remove unnecessary space and padding hack.