Remove some dependencies. Make edit form shorter.