remove unneeded exceptions, add needed exceptions