More cleanup on act_comm.c