move old stuff, mode cleaning up