Remove redundant definitions
Add option on objective start to ignore EOS
Re #3