Removed the last of the NEI stuff.