Comment out working code for the time being