More beta cleanup