Clean up Base class