Some cleanup in mob_cmds.c