remove label resolving
review structure