Clean up the remote executor stuff and create a dedicated heartbeat