Remove old padding and margin mixins and catch final use