[TASK] Cleanup draft workspace usages