Cleanup & license change.