Removed old questionaire, closes #883