Merge "Remove create_server and rebuild_server methods"