CLOUD-322 fixed deletion logic
CLOUD-322 fixed amazon template