cleanup for merge to master/dev