fixed remove to check for correct unit.