Remove duplicate analysis
Add missing forms