Remove some more :should calls