I'll take an action to file a starter bug about doing this cleanup -- doesn't feel big enough to need a full Trello card IMHO.