Remove sort (unnecessary)
Remove unnecessary references
Simplify includes
Update header comment
Move CLI interface to common
Remove invalid #include