right back where we started (with less clutter, at least)