added removeUnit to simplify