Remove some default variables that butcher code