cleanup for 5.7.x