remove NewIfChange and other fixes