clean up of prepare response method