removed warnings and unused classes