Bump Athena to 25.0.9 and remove hacks
I put in some hacks to get !693 (merged) to run on the 25.0.8, but with the new release these should not be needed.
I put in some hacks to get !693 (merged) to run on the 25.0.8, but with the new release these should not be needed.