[common] clean up