removed deprecated useless classes and modified others