EOS Update
Clean up