Updated removeNulls