Remove some unused classes.
Suppress some compiler type warnings.