clean up in releases/v1.7.3 branch