Revert "Revert "Use only one unit.""

This reverts commit 7b124ee4fceb95902a6e17a51a8315daf1f51963.
Duplicate delete removed.