Remove starts_with() code