clean-up round 1
fix ImageManager