Remove obsolete classes.
Fix failing test case.