More Code clean up and licensing.