Cleanup. r=rail