Cleanup of logging, imports, and licenses