Can you comment why we're removing this class?