Update licensing and cleanup