Moved over to CNI and cleaned a bit