Removed remaining hardcoded paths