Deleted old and unused classes