Remove unused objects.
Add missing interfaces.