Remove additions to local fork of SBV that are no longer necessary