Remove some refactor items