more binding cleanup