cleanup after dependancy reduction.. reduced some use statements