Cleanup some un-used imports

@krisselden drop some imports and swap a `var foo = NonStandard.Thing()` to a `var blah = Standard.thing()`