Removed obsolete variables.
Added percentage datasets for warning and unpretty as well.