MORTEVIELLE: Remove some useless code and variables