more cleanup, uses v0.2 of bridge