Remove unused class and add comments