Remove unnecessary checks of null values