Edited comments
removed old code