i think we could do something similar to clean up payloads