Remove more unused lines/icons; stop lint thinking that showAsAction=always is used unconditionally.