Remove unused functions
Remove tgt_pool from match state