Removed unused boilerplate