refinement: cleanup misc.