Cleaning of commented code in some functions.