final clean ups
Merge pull request #1086 from twokul/ed-guides

final clean ups for ED