Merge "Remove redundant parameters for server creation"