OPAL-2144 Removed some functional unit dependencies
PMD fixes
FunctionalUnitService removed