Better res selection, remove unused things