Removed some of the boilerplate