Removed old code & Fix images show