Some cleanup

Signed-off-by: geoffsdavis <geoffsdavis@yahoo.com>