Merge "Clean-up after TZUvA feature removal."