[Finishes #74490370] Getting list of types and refactoring to remove individual services in favour of generated ones