Fix sort order of callees. Closes #50
Remove dead code