remove unused class. add some comments.