Remove more unused classes