Remove junk variables/params