Remove junk vars