Removin unused tables see #6709