Removing code that uses old work types