Table models cleanup