clean up after 1.6 merge