remove useless classes from cassandra, rename test casses, make everything compile with as few classes as possible