Cleanup diff for merge with master
Cleanup for merge with master