Remove unnecessary (and ugly) padding