Got rid of bitmaps