Removed commented code lines