remove more unused classes