cleanup of binary container stuff