quincy-common: cleanup more