removing unwanted icons. refactor class name