Tweak to catch and remove all ae prefixed attribute types