Cleanup some dead legacy