remove unneeded boilerplate