Removed some ancient boilerplate