Removed more unused strings and one pager stuff