Remove some obsolete classes.
Remove unused constructor parameter.