misc: qcommon clean up