[ ] change to plain inlines
[ ] delete unused imports and variables