[tor-commits] [compass/master] Remove abstractions