removed test and deprecated classes