Fix renaming of "organization category" to "category ESS" and delete unused table