Cleanup for workshop