tidying up of old class names