Remove unused vars, clean up slightly in multiform.php