Put Talis copyright notice back to comply w/ Apache 2.0 license.
Remove a few more code Talis references.
Clean up imports and tabs.