Fixed creation of entity elements on O0
Removed unused imports