Get rid of legacy gunk
Avoid margins