Removes stubs in DPMS and puts in appropriate UTIL/INT attrs in EOI
Some cleanup
Merge pull request #2188 from lukecampbell/fixes

Cleanup and fixes