More cleanups

Signed-off-by: Chuck Short <chuck.short@canonical.com>