Remove useless code and rename some variable in Cissa