Code cleanup for 1.61