Cleanup BIO creation to be more correct