add test and remove unused classes