removed searching from removeUnit()