Cleaning up for alpha release.

* Optimizing imports
* Removing last of "testing" paths.