hard-coded localhost removed