clutter: simplify