cleanup bitmaps

Change-Id: I3af4cbbb9916434a2f8e49d860eb826d06681790