remove unused classes
other fixes