drop unnecessary nil checks