Removed optionality for v2
Removed optionality for v2

It was only there to keep backward compatible

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation