Cleaned the discovery script
Cleaned the discovery script