why the removal of this class?