Cleanup, adding interrogators