Code cleanup for ItemFactory

Getting rid of old code that isn't needed anymore. Added E-Tank to item
templates.