Remove table suffix where not necessary.