Remove blank
Add create/validate EventSource