Clean up more problems related to someone's accidental commit