cleanup for Workshop