cleanup pre-merge to master