Issue #430 - Remove unused uses