More moving of a pseudo enum to a real enum.
More enum reworking.
Removing unused imports.