Remove handleFormFieldClick call from source as well