remove unused code in one branch