CASSANDRA-7559: Removed Unused Import, Renamed Vars