Fixed cleanup ghost values from form