Remove Cassandra/Calliope specfic stuff.