Fixes for new rustc
cleanup of unused stuff and other lints