Remove some unneeded Boilerplate business