More cleanup before doing gluster heavy-lifting