Update and clean up IC2 API.