Some classes was added
remove unused classes