Remove unnecessary imports, standardize others

I used the optimize imports on the dao folder, we can do more in the future, but I figured this was a good chunk to start on. Please test and ensure it passes the same tests as master and we can start getting rid of these code smells.