Move to use Calls grammar instead of Cloning
Removes dead code