[IR] Bunch of trivial cleanup - testing some vim plugins :)

* Removed unused imports, whitespace, etc.