remove unneeded boiler plate