Misc cleanup

Signed-off-by: Thomas Wagner <twagner@ivlab.com>