Cleanup some old references
Add NWEC stuff