cleanups

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>