Refactoring: Removed not longer used methods and fields for operator distinction