Remove deep path grabbing