cleanup and remove deprecated classes