Cleanup code and making call data processing asynchronous.

Change-Id: I99e282e5f32b3f53be5e2421d9a2992e4f1ccb59