remove shapes when text value set and other related changes