pull, rm fixes