remove unneeded definitions
Fix #271 although without line numbers or source file
Include exception add-ons