CLOUD-141 removed unused variables