Cleaned out the question resolver