Removed interrogate wrappers