Remove default license and improve metadata support