Hopefully they are actual optimizations and not me just destroying everything.

Please beware of other tons of unnecessary changes I did like with import paths and other stuff just because I am a disturbed person.