tools-update: more cleanup