Re-More Cleanup