tweak to remove comments.