Remove some gubbins