Hardcoded paths removed