Merge "Remove http port"