Cleanup for offline work