1. Fix image id
2. Remove debug info