move and cleanup