Commented out some of the calls that were crashing