Update to v25.0, and remove uses of deprecated types. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>