Comment blocks cleanup