Remove unused code
resolve conflict