Ditch more of the old prototype code