Remove more code now that a file field is used.