removed deprecated and test classes