Revert "Optimized imports"

This reverts commit bef84b428b7fd903ba785742bc9063834d02e429.
Since it broke the whole application.