Merge for cleanup