Fixed some weird thing zack was doing to shit.
Removed unused imports