Remove cruft and fix move issue