clean up egypt demo and rewrite labels