Remove unused sort order stuff from first iteration
Add some todos to remember for refactoring