Cleanup Round 3.

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