Add a call graph parameter to the transfer analysis
Remove commented out code