Cleanup of image device interfaces (nw)