cleanup; removed unused classes