Some cleanups in rcon