Honor -tune

and tidies up a lot of unused elements for cleaner compilation.