removing payloads works, closes #47 closes #29