Remove some variables which aren't used