removing obsolete members
Passing tests