Comment out codes temporary