CodeBook cleanup