Removed old boilerplate