cleanup for 1.09