Removing the dependence on Idyll in the workspace