Clean up for form utils