Removed image services, merged in API services