Clean up circular references (maybe stop a leak on MCPC?)