Removed TermBuffer class