Got rid of null awareness utilizations