clean up, first licensing, further merging