Improves the fix for #86681 by removing the worskpace remover, which is ...

...no longer needed.