Issue #25

reused cells were not always cleaned up properly