clean unused code
conflicts