removed redundant class. Issue #134