optimize imports

* and unrelated cleanup
cleanup & optimize imports