Remove the need for DEV_PATH