Remove unused options
Add placeholders for new concolic target strategy