Removed or refactored images to simplify deployment