Fixed: cleaning up form data