Stripped more comments