Get rid of pesky empty variables