Post r? cleanup