Remove old debugger call, other old code
A little bit of sorting refactoring