Remove comments in spec, fix codes in Network