License headers, cleanup