cleaned up unneeded boilerplate