cleaning up calc_resp hacking