Removed extending call handler