cleanup for 3.14.26