exp various: Cleanup Enumeration