Removing includes from question stuff