Remove more no-longer-necessary local additions to SBV