ITK stuff cleanup