Cleanup, no need to do ghetto process.env.PATH things