Workshop cleanup