Deleted old images, updated some functionality