removed most of unused classes