435: temp remove some unused classes