added deletion of annotations if saving in agent_only mode
more logging in annotation deletion