Revert "Distinguish between futures and options instrument types"

This reverts commit 75a84e086e03f68942578647b40d3cd30af42cf4.