Remove unnecessary null checking