remove deprecated Bitstream class
refactor Image type stuff