enum removal

Removed a couple of leftover enums from previously used custom classes.