Removed commented out code lines