Adding a bunch of licensing and export cleanups