cleaned out some old cruft