Remove change for null check