Deleted obsolete and unused classes