clutter: clean up