removing all reference to compass
More compass removal
more cleanup plus rev