EEPROM fixes
Cleanup