Update image names and remove unused

Closes #1