@shacker shouldn't we also delete them when it wasn't successful?