Much of the work done to the ScaleAV monitoring work has left clean-up items that are deferred scale-to-scale. These items should be clean up to make professional grade product.