bp: remove circular dependency