removed old commented out boilerplate