revert some reordering of use statements