#2368 Remove comments