Moved some of the delete code into flist.c since the generator now