Clean up question module