I think a good scrubbing like you mentioned at some point should help get these out of here.  Although it could be that the hibernate is loading our classes by name, and maybe there is a way to pass our CL?