cleanup
prepare for general form handler
cleanup template files