cleanup in a few places that are not being used on a day-to-day
basis as much...