Remove hardcoded port number