Improve Cleanup

[PSchmiedmayer]

Improve Cleanup

:bulb: Proposed solution

• Improves the cleanup by doing an best-effort approach to remove any created keychain.

Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

• [x] I agree to follow the Code of Conduct and Contributing Guidelines.