Some cleanup and initial conversion to percona_xtradb_cluster