Remove old_code (useless); pluralize field named keyword into keywords