Remove old S17