Refactor remove unused classes.