e1 clean up
Merge pull request #290 from SGA-Brookshire/master

e1 clean up