#606: Remove last vestige of old workspace scheme