Remove commented out codes