Remove incorrect forms
Add missing forms