Moving stuff about. Cleanup