Remove BPs which didn't make the Juno cut.

Change-Id: I3f4ebe0a6fcde4a878092bf88fa3f77d81dc0db7