Modified map; Removed useless Image entries