Remove dependency on pivotal_workstation