Clean up duplication