Fixed some bugs in infix-construction during removal