Remove hardcoded paths... again