Clean up after Component removal (good housekeeping)

Just recently in the beta they added this one and it was from 6 years ago. :rofl: