Cleanup, less reliant on image sizes