Getting rid of unecessary enumerations