Add removal of [Infix]