remove unnecessary code from forms
fix next field in views
update tests