More Cleanup and adjustments.

Signed-off-by: Michael Howe <mike@mcsnetworks.com>