Fix #29 cleanup