Removed mobile controllers
Migrated comparator to third party package