Remove wasteful empty? check