Getting rid of null value fields