Remove the cruft and add the CLA