Removed autoselection of any use, more cleanup