More Ekg cleanup.