Merge down for cleanup