Fixed server override not working properly
Removed debug messages