Clean up after Component removal (good housekeeping)

@kfawcett , are you trying to steal my glory? :innocent:

2 Likes