Perform optimizations and code de-duplication where we have code duplication between the catalogd and operator-controller.