Cleaned up server reference