took out some really old cruft