removed old code
handling super types moved to own resolve context
completion work for deep elements