simplify install / remove logic