Cleanup after move and change of interface.