clean up some unused use statements etc