Adjusted the rpath, removed unnecessary variables/values