Cleaning up removing of components/commands/detectors and loose references. Fixing block remove

2 jobs for master in 24 seconds (queued for 3 seconds)