cleaning up old cruft, preparing for integrating stuff