Clean up enumerations.
Remove spurious file.
Nitpicks.