CLOUD-252 removed unused elements