cleaned up imports for base util