Major workspace cleanup