Removed a bunch of boilerplate