Remove substring check