Cleanup response interface. Closes #1256