Additional old file access code removal