Revert "work on eliminating double calls"

This reverts commit a8112b352f316e66bb7c613251343be084ff8db7.
work on eliminating double calls