Fix bug.
Remove unused class.