Remove old (and unused) srarp stuff