Start removing comments a little bit earlier