Fixed clean for retrieve