I have removed the class, Please review.