Simplify license

also fixes #1720