Remove name server.
Refine iconizer code.