upgrade yamwow, remove redundant code