Reenable debug, comment out problematic lines