Removing Cleanup Workspace support