remove lot of boiler plate