Clean up some BN stuff