check sorting order & remove unused dependencies
Merge branch 'dev'