Added icon, removed dead code