Part 3 of large refactor

removal of superclass exception handling