license and cleaned up client-data