clean up move methods