Added comment and removed unused code