Remove remaining Compass references