avoid useless variables
(#618)