More Bitmap-related clean-up