Remove from fileio.c