Cleanups in file checking refs #10