Address CR and add response object cleanup