updated with rm cleanup