Remove unused/uncoded options from dev branch

Fixes #6004