Removed commented out codes