Removing checks that seem like defensive programming