Remove sourcing & stick with PATH