Cleanup before 2.4 release.

Signed-off-by: Mike Howe <dockter@almuramc.com>