1st round of cleanup.

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