Comment out bugged code