Remove stuff no longer needed/used here.