remove double check for null in value source