Removed old and unnecessary comments