Cleanup after Merge, no more compilation errors.