Added the Images and cleaned up a little unused code