cleanup some boiler plate I don't need