HG : Fourst commit
Revert "HG : Fourst commit"

This reverts commit 5a9a17c6a8aa95c07d5b4e1ee2a9b14d52607ea6.
HG : Clean up code