Removing some unused stuff (mainly imports)