Remove some variables that aren't used