Cleanup some duplications