Finish to clean Numion commits merge