Clean up annotatedimage, make image ID dynamic