FAQ module porting

Why did you keep this commented code?