clean up from dev process after rebase from trunk