Clean up and using Retrieve rather than Retrieve all