remove component-o, change extract-refs