[Commenting Service] some cleanup..