Removed old images
code cleanup