Remove extra exceptions