clean up some unused classes