Removed a lot of licensed stuff because this is a public project
Merge