Refactor. Removed unused code. Trying to replace images.