Some refactoring into remove field & remove method features