Remove not very useful comment.
Remove some classes that weren't adding much value.