Remove some old cruft and start getting things ready for Kiva