Cleanup after new image server.

Deleted the bits and pieces no longer needed.