Clean-up superfluous comments