final bits of cleanup...

there is always more!