Remove deprecated conditions