Remove unnecessary null / None check