Clean up a few things (mainly unneeded imports)