Fix stupid copypaste bug. Add some cleanup.
Fix stupid copypaste bug. Add some cleanup.

SKA-ScienceDataProcessor/RC,SKA-ScienceDataProcessor/RC,SKA-ScienceDataProcessor/RC,SKA-ScienceDataProcessor/RC,SKA-ScienceDataProcessor/RC