Replace some load-file with require