Revert "Optimize imports and such"

This completly Fucks the build

This reverts commit 3d3f88dbb61f24773b3f1e8d0bbea6f0a257a88a.