remove unused classes. fix warnings.