license and other cleanups