Comment and licensing cleanup