Cleanup for merge to master 2