fix some unused imports, cleanup errors.  
remove some unused / outdated stuff from utility classes