Cleanup and license change