general cleanup and motion work