Merge "Remove redundant cassandra check"