cleaned up imports
no more intermediate base class for exceptions