cleaning up, preparing to move things out more