Remove changes to setup shape as we no longer set serde props (see HIVE-4306)