Removed b/c code that triggered long key errors

Change-Id: Icd73b658431549e0e1077fbf4baf9845d8b6f103