Updated IC2 API
Clean up