Comment cleanup continues...