-Werror,-Wunused-variable

...plus clean-up

Change-Id: I37252f505c76f6f6be14873e13da4e660a4a623a