Remove timing logging
Remove cruft
Support integer-formatted enums