Remove unneeded boilerplate