Remove old getIcon and getImage funciont