Merge pull request #1273 from brooksryba/projects/enova

One last style
remove assembly
Merge pull request #1340 from Tendrid/projects/enova

remove assembly
Merge