More file cleaning up