Sortable: Cleanup

Closes gh-1168
Closes gh-1169