Terminate the big refactoring session !