ECMS-4304 cleanup workspace part