Cleaning up padding