@dan: Removing EOS