merged a schema/file handling cleanup