cleanup dead / misnamed class