Removed direct references to file paths