Issue #73 - Clean up forms.