Removed Compass leftovers