RTGOV-321 Simplify use of properties, and remove use of CDI property injection