Revert "Refactor execute to accept options"

This reverts commit d5103d8a9c42e00e420d1a73b21aa61cc09f903d.