removed more hardcoded paths