More selection view cleanup