Remove Bitmap deps :(