Removed old comments and extraneous lines