Removed unused code
Differentiate between servers