Unnecessary remove-unit()