Updated logic around removing workspaces