Cleanup orphaned func, new image-name calculation

Cleanup orphaned func, new image-name calculation #4724