Drop support for return data Bitmap & small refactors