Cleanup
Removes duplication in SelectionView