That was actually part of my plan for Code Cleanup Part 2 when I look at the Cassandra backend. Let's leave this as is for now?