Remove logic that became unnecessary
Merge remote-tracking branch 'origin/feature/remove-source-image' into develop