Remove debug
Support for no image