remove unneeded boilerplate code