removed uncommented code
fixed bmp leak
Merge branch 'dev' of https://github.com/jojonv/tabby into dev