Left over from flatfile handling removed