Removing fabricated call to the APIs