Comments out a few apparently unused bug defines