[MAINTAIN] - Removed the enumeration stuff.

* Description:
Was planned to use enumeration but not quite necessary.