Cleanup some dead code