Removed todo for eos