remove some old links from new
refactor fill_in_form method