rmap cleanup