@smh, I thought you tested this. 😦 I was just now trying to build Athena with the removal of these flags. By now I bumped into the 3rd class that I would need to extend to make it build. So I'm pulling the plug. 😦 This will have to be tied to a big cleanup of the Athena repository first. One that you do locally, with these flags removed...