final clean ups for ED

#1064