Remove unused boilerplate