Cleanup double code + SELECT 'table' verification