Removing legacy exception handling and infrastructure