remove deprecated table, add exclude filtered functionality