Adding retries to all commands.

Fixed a bug with ocelli intergation where the remove were not working.