Please update the comment and remove the class