remove more of the exception
Finished removing the exception (hard work)