Cleanup response_parser
More cleanups.