Drop useless variables

Part of @Lathanael's Forge patch