++ Removing enum - the cause of so many problems
Revert "++ Fixing import loop"

This reverts commit 44b9da233095a85a46026b0d19dcb1e39cdb0ee6.