Removed path manipulation (wasn't necessary)