Back out more leftover unused crud