More Old BMP Code Gone