cleanup for merge into master 2