Revert "Added Calling features"

This reverts commit aed6e28059aaf7b648e7269cb62201d84bed5c5d.