Remove client_engine_additions.h