Cleaning up images.go