removed commented out codes