final cleanup after talking with bucketh3ad further