Add competition message and remove obselete if statements