Cleanup: remove duplication.