some cleanup of the remote commands, i hope.