Remove some exemptions that are no longer needed