The new definitions (Enum based) have been present for quite a long
time.  Let's remove the deprecated ones in accordance to previous
planning.

Reference: https://trello.com/c/BMC7yFbXSigned-off-by: NCleber Rosa <crosa@redhat.com>