Remove PATH support, use cwd instead