remove clutter and old comments