More BEQ clean up.