Fix Note forms
Remove superfluous fields