Remove duplicated edp case code
Remove duplicated edp case code

8l/Template-Assembly,mattbierner/Template-Assembly,8l/Template-Assembly,izissise/Template-Assembly,mattbierner/Template-Assembly,izissise/Template-Assembly