JCLOUDS-750 At the cost of fiddling with type hierarchy adapters, remove lots of junk with google auto.