Clean up from boiler plate creation