Updates removed -s special arg and references