cleanup needs to use name instead of transmission id now