Cleaning of the merged code