remove warnings and unused classes.