Temporarily not removing comments by default