Remove dependency on old flatfile.py