Remove more boiler plate