remove icon specific code