Revert "Cleaned a few minor bugs, optimized imports"

This reverts commit 0c0dac2b180145109afaaaa699ca1e8e808b50d5.