cleaning up cassandra datasource implementation