Drop more unneeded overrides

Using these from serrano-common works fine.  This fixes our compass.