More cleaning of some comments by Abdou