Add new method removeSort
Several changes
Refactoring structure of index()
Remove println
Merge branch 'APD-628-BOZ' into develop