added "borne" as special case not to change from state to modifier on
'cleanup'