Cleanup unnecessary null usage