Revert "Revert "Delete CallingCons.java""

This reverts commit ad527f0cd2ce15623929a905d9aaf98cffd2e4ec.