Remove some testing vars