PM "RE" cleanup