Revert "Checking if there are options"

This reverts commit 7b6f518ef6a10150bdd2726134bb07943d18902c.