Clean up
Allow values of parameters, area codes and event codes to be empty
Cleanup