Removed some gubbins