More CodeBook cleanup