LILY-336: Cleanup forms
Merge branch 'feature/cleanup-forms' into develop