Changes to clear class