Cleanup Angler defs