up to 1.3.1

clean old transition code