Introduced SymKind in resolver and cleaning