clean up in releases/v1.7.2 branch