Added comment and removed old code