Lil' cleanup
Cleaned + removed unnecessary imports

Ready to merge. Working alpha.