Removed unused hidden inputs
Merge branch 'updates'