removed unnecessary methods from EW class.
Merge origin/master