final bits of cleaning up