Cleanup, add BSD-2 license