Cleanup of companion-server