Remove Enumeration

Resolves #1126