Removed BitmapLoader references