Remove wip master resolver