Removed old code, comments added